Pin fix

Used rebase this time. #11