Short term solution implemented for #126