#485 Fixing implementation