Fixing issue with container