removed previous workaround since it wasn't actually working