diff --git a/amadeus/permissions.py b/amadeus/permissions.py
index 3d69f4f..380405a 100644
--- a/amadeus/permissions.py
+++ b/amadeus/permissions.py
@@ -39,7 +39,7 @@ def has_resource_permissions(user, resource):
 
 	if resource.visible or resource.topic.repository:
 		if resource.all_students:
-			if subject.students.filter(id = user.id).exists():
+			if resource.topic.subject.students.filter(id = user.id).exists():
 				return True
 
 		if resource.students.filter(id = user.id).exists():
diff --git a/amadeus/templatetags/permissions_tags.py b/amadeus/templatetags/permissions_tags.py
index af29962..005bf06 100644
--- a/amadeus/templatetags/permissions_tags.py
+++ b/amadeus/templatetags/permissions_tags.py
@@ -10,4 +10,8 @@ def subject_permissions(user, subject):
 
 @register.assignment_tag
 def subject_view_permissions(user, subject):
-	return permissions.has_subject_view_permissions(user, subject)
\ No newline at end of file
+	return permissions.has_subject_view_permissions(user, subject)
+
+@register.assignment_tag
+def resource_permissions(user, resource):
+	return permissions.has_resource_permissions(user, resource)
\ No newline at end of file
diff --git a/topics/templates/resources/list.html b/topics/templates/resources/list.html
index 24bf3cd..d49671c 100644
--- a/topics/templates/resources/list.html
+++ b/topics/templates/resources/list.html
@@ -5,7 +5,9 @@
 
 <div id="resource_{{ topic.slug }}" class="list-group resource_list">
 	{% for resource in topic.resource_topic.all %}
-		{% if resource.visible or has_subject_permissions %}
+		{% resource_permissions request.user resource as has_resource_permissions %}
+		
+		{% if has_resource_permissions %}
 	  		<div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
 	  			<input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
 		    	<input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
--
libgit2 0.21.2