Fixes #3092

Entry for Google Code-in.

Fixes http://bugs.sugarlabs.org/ticket/3092.