Fixed #21. Again