Fix 48

Fix #48