fixed part of #20