This might fix issue #56