Bug fix after deploymen