Fixed #48: Make it more compatible