Added workaround for systems without lunchbox version 1.7.1 or higher