Fixed #1233
Addition for #1233