Fixing cube issue