Maxcube fix for issue #1599