Tempory fix to see if we can get tests passing