Temporary solution for #308