Fix on Issue 249