Merge nattaku's fix