Issue #503 fixing MVC logic