Fix #1 - thx Adrian :)