Implemented workaround for #19