Compatibility fixes - bug fixed