Works on #40