Quick fix in order to make the tests pass. 
 Temporary stuff in order to be able to use access. Delete when access
is phased out.