Adding fix from #813
Adding fix from #813

rjgotten/canjs,UXsree/canjs,rjgotten/canjs,whitecolor/canjs,tracer99/canjs,gsmeets/canjs,beno/canjs,rjgotten/canjs,tracer99/canjs,bitovi/canjs,ackl/canjs,bitovi/canjs,patrick-steele-idem/canjs,whitecolor/canjs,Psykoral/canjs,ackl/canjs,rasjani/canjs,Psykoral/canjs,Psykoral/canjs,rasjani/canjs,UXsree/canjs,Psykoral/canjs,patrick-steele-idem/canjs,beno/canjs,ackl/canjs,shiftplanning/canjs,bitovi/canjs,gsmeets/canjs,rasjani/canjs,whitecolor/canjs,rasjani/canjs,dispatchrabbi/canjs,patrick-steele-idem/canjs,beno/canjs,gsmeets/canjs,shiftplanning/canjs,bitovi/canjs,asavoy/canjs,asavoy/canjs,dispatchrabbi/canjs,tracer99/canjs,rjgotten/canjs