Fix #2

Very inefficient but works 100%