Back at it! OK well that's one way to fix #28