Fix support for custom views