Slight workaround for now