Fix #355 (2/2)