Should fix problem described in #14 - making it compatible with nexus 2.8