#64 improvement