Fix for some views