[Core] Added better fix for #112. (Missed Commit)

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