Pushing a quick fix to #15