Fix #576. @ramdor Please confirm