Fixes #78 with a workaround for TypeScript service errors