issue #75 is supposed to be solved, check in production