Fixed_implementation #233