Fix #13 again

Fix #13