|#000|Fixing broken functionality