Change implementation as prior failed on rbx