Reverted due to wrong behaviour. To be fixed.