should fix |#495