Fix #355 (1/2)