fix for new layout