FINALLY think I've solved #109