Fixes for issue #9 for the meantime. Need to keep an eye on SI-4929 for future changes with regards to this issue