Solves bug in #142