Fixed for unit tests