2.1.5 bugfix

Fixes a particularly obnoxious CTD