[m2436] Added better fix for #112.

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>