Reverted to previous fix
Updated to version 0.4.1