solves #338