Supports #152 and #153