Another fix for testing purposes