Fix for gingerbread

Fix for the issue #193