Quick fix to close #57