fix bug#1234
Really fix bug#1234