Cube issues - fixed