This should not be necessary with Plek 1.1+