Fixed bug introduced by 6be1153