Workaround for #56 #97