Quick fix to close #16