BUG #112 fixing ongoing