[DONE][Fix] bounty 275