Added handling for testing purposes