Fix #4 (I'm blind, but this should be it)