#21 Trying to fix bug