Fixes ugly bug on commit 647808a96c3713b5428c8d0b611fef5feca07767