[fix] closes #555