#5 reverted fix, decided not to put this in yet due to breaking change.