Fix #4 the way @Quintesse recommended