Fixing #1 and #2