DEV-51 | Last fix