Fixed #16 (hopefully)