Slightly hacky fix to #13