Fixed 2 issues #1 #2