[#ticket 000] Bugs fixed :)