fixed sinks handling