Implement #251 (sound may change)