Update should fix issue #577 based on @azrin1972's testing.