This fixes number 2 I think

fixes #2 for sure