as consequence of previous commit - #504