Restore fixed #152