#5 Fix annoying bug