Fixed #40 for everyone