hot fix #233