Fixing Container Problem