fixes #141 (I have used the first one)