Fix for multiple items