Implemented API 1.1 fix