Fixed issues with 1.5 onwards