Addressing #328 until the fix is merged into Rails