Fix #1 for now. Long term fix will be included in the next major refactoring