#5 fixed - hopefully