Suggested fix for  #106