JAL-2292 renamed method and improved implementation as suggested by Kira