#SGoo-51 Fixed