Yet another bugfix

A very small update that fixes bugs I've been meaning to fix for a long time. Enjoy!