Revert bug introduced by version 0.5.4
Version 0.5.6