#294 - Fixed branch...sor of