Fixed error #235