diff --git a/Utility/CurrentBase.php b/Utility/CurrentBase.php
index 8b2e085c..fc82b0ea 100644
--- a/Utility/CurrentBase.php
+++ b/Utility/CurrentBase.php
@@ -326,7 +326,7 @@ public static function permission($key, $roomId = null) {
 			return false;
 		}
 		if (! $roomId) {
-			$roomId = Hash::get(self::$current, 'Room.id');
+			$roomId = self::read('Room.id');
 		}
 
 		$path = 'Permission.' . $key . '.value';
diff --git a/Utility/CurrentFrame.php b/Utility/CurrentFrame.php
index e3a65c38..2438b157 100644
--- a/Utility/CurrentFrame.php
+++ b/Utility/CurrentFrame.php
@@ -55,7 +55,10 @@ public function initialize() {
  * @return void
  */
 	public function clear() {
-		$models = ['Room', 'RoomRolePermission', 'RolesRoom', 'Frame', 'Block', 'BlockRolePermission'];
+		$models = [
+			'Room', 'RoomRolePermission', 'RolesRoom', 'Frame', 'Block', 'BlockRolePermission',
+			'RolesRoomsUser', 'Permission'
+		];
 		foreach ($models as $model) {
 			if (isset(Current::$current[$model])) {
 				unset(Current::$current[$model]);