Test and fix related to #138