fixed for new design