Bug/323

It fixes #333