Implemented workaround for #45