This would propably also resolve #5
This would propably also resolve #5