real fix of carrierwave
merge in detached head