[Pharo-project] Issue 364 & 365