Shoulda done more testing... >_<