same note that I've done here: https://github.com/ezsystems/DemoBundle/pull/74#discussion_r12089034