Generic views bug fix