Temp 'fix' for first cube problems