Fix #119 But introduce new bug, pushing to pull back and work on another machine