Fixed broken code that was pushed at an earlier stage