Fix #349 (hopefully)