FL-507: this is a fix for the prior fix. Should be working.