Fix #5 for now