Fixed something in addition to #1