#1 #2 Fixed