Fix for previous mistake (maybe temporary)