Fix #314
Hacky Fix #322