Fix (finished split) #9 & #4