Add test, fix by Brandon Malone