Bugfix... previous commits lacked testing