Fix AbstractMethodError 500 - fixes #589