Updating fix of #41