Improvement for #5, not marking it as fixed yet though