Watchify breaks fix branch