Fixed #101 for now