better fixture handling