Hack for VS internal error. Fixes #23 (again).