Reverted to v0.0.6 and applied fix in #4e27906