Fix Bug #249