Updated from smcp-0.6-22-g518dc1d