Bug fixes for issues #2294~#2298