Fix #8. Not the most elegant solution...