Fix #300 (Woo! 300 issues!!)