Compatibility fixes - bug fixed 2