Fixed bug SP-18