BUG #112 fixing ongoing
BUG #112 fixing ongoing