Fixed your shitty view
merged the view fix from master