Changes for GMT reverted and bugfix added