Improved fixture handling. #6.