Try to fix it #43