FINALLY fixed #13! :smiley: :+1: :icecream: : and :cake: :ice_cream: and :cake: