Improving fix for issue #252
Improving fix for issue #252

yakatak/YapDatabase,dezinezync/YapDatabase,yakatak/YapDatabase,yakatak/YapDatabase,dezinezync/YapDatabase,skeeet/YapDatabase,skeeet/YapDatabase,yakatak/YapDatabase,dezinezync/YapDatabase,skeeet/YapDatabase,dezinezync/YapDatabase,yakatak/YapDatabase,skeeet/YapDatabase,dezinezync/YapDatabase