try make it compatible with stable releases