Temporary fix for /bed. Please test...